BZR conflict list format 1
